volume: Port to MetaSoundPlayer for emitting sounds

Move away from ShellGlobal API, which is too tightly coupled to
libcanberra-gtk.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/327

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 00af791a6ee4772744edaa41c8c98dc22e2bed1b..019030570d1a0cedbdf7f3bfcd75dbbaaad94f77 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -57,6 +57,7 @@ var StreamSlider = new Lang.Class({
         });
 
         this._stream = null;
+        this._volumeCancellable = null;
     },
 
     get stream() {
@@ -129,11 +130,14 @@ var StreamSlider = new Lang.Class({
     },
 
     _notifyVolumeChange() {
-        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID,
-                                'audio-volume-change',
-                                _("Volume changed"),
-                                Clutter.get_current_event ());
+        if (this._volumeCancellable)
+            this._volumeCancellable.cancel();
+
+        this._volumeCancellable = new Gio.Cancellable();
+        let player = global.display.get_sound_player();
+        player.play_from_theme('audio-volume-change',
+                               _("Volume changed"),
+                               this._volumeCancellable);
     },
 
     _updateVolume() {